luci-mod-network: restore DNS option semantics for proto static
authorJo-Philipp Wich <[email protected]>
Sat, 20 Mar 2021 23:36:24 +0000 (00:36 +0100)
committerRafał Miłecki <[email protected]>
Thu, 27 May 2021 10:19:05 +0000 (12:19 +0200)
The peerdns settings makes little practical sense for proto:static
interfaces, so revert to allow setting the DNS server list directly.

Fixes: faad7464a8 ("luci-mod-network: add support for network.device sections")
Signed-off-by: Jo-Philipp Wich <[email protected]>
(cherry picked from commit 2bfd4908a9cfeac74c7abc31d8cef0bf1e58af52)

modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js

index 7b3f93d50ad451646222e9ac7aa975d6eebdb763..3ea7788af1fff0e18091a903a2e4ee47222a7d8d 100644 (file)
@@ -680,9 +680,11 @@ return view.extend({
                                o.default = o.enabled;
 
                                o = nettools.replaceOption(s, 'advanced', form.Flag, 'peerdns', _('Use DNS servers advertised by peer'), _('If unchecked, the advertised DNS server addresses are ignored'));
+                               o.depends({ 'proto': 'static', '!reverse': true });
                                o.default = o.enabled;
 
                                o = nettools.replaceOption(s, 'advanced', form.DynamicList, 'dns', _('Use custom DNS servers'));
+                               o.depends('proto', 'static');
                                o.depends('peerdns', '0');
                                o.datatype = 'ipaddr';